Codecov Report

❌ Patch coverage is 81.25000% with 6 lines in your changes missing coverage. Please review.
✅ Project coverage is 83.29%. Comparing base (c45d8e6) to head (63f7a1d).
⚠️ Report is 11 commits behind head on master.

@@            Coverage Diff             @@
##           master    #8692      +/-   ##
==========================================
- Coverage   83.42%   83.29%   -0.14%     
==========================================
  Files         416      419       +3     
  Lines       32303    32438     +135     
==========================================
+ Hits        26948    27018      +70     
- Misses       3993     4042      +49     
- Partials     1362     1378      +16     

The generic xDS client's configuration can be found here:

We need to propagate this newly added server feature to the generic xDS client as well. In order to do that, we need to do the following:

• Either of the following:
  • Add a new field named TrustedXDSServer in the above mentioned ServerConfig struct, or
  • Add a new field named ServerFeatures which is of type []ServerFeature and remove the existing IgnoreResourceDeletion, or
  • Add a new field named ServerFeatures which is of type map[ServerFeature]bool which is the idiomatic way of representing a Set in Go. Again, remove the existing IgnoreResourceDeletion field.
  • I would prefer going with the second or the third approach since there is already a comment there saying IgnoreResourceDeletion will be removed in favor of two new fields when A88 is implemented. Instead of adding one field per server feature, we could instead have a container to store the server features.
• Add a method in the ServerConfig struct of the generic xDS client to check if a server feature exists. This could be something like:

func (s *ServerConfig) SupportsServerFeature(feature ServerFeature) bool { ... }

• Introduce exported constants for the supported server features in the generic xDS client. This could be internal/xds/clients/xdsclient/xdsconfig.go. Something like:

type ServerFeature int
const (
	ServerFeatureIgnoreResourceDeletion ServerFeature = iota
	ServerFeatureTrustedXDSServer
)

• Remove the existing direct reference to IgnoreResourceDeletion here:

  grpc-go/internal/xds/clients/xdsclient/authority.go

  Line 473 in 7472d57

  if serverConfig.IgnoreResourceDeletion {

  and replace it with a call to serverConfig.SupportsServerFeature(ServerFeatureIgnoreResourceDeletion)
• Add logic to populate the server features in the generic xDS client config here:

  grpc-go/internal/xds/xdsclient/clientimpl.go

  Line 166 in 7472d57

  func buildXDSClientConfig(config *bootstrap.Config, metricsRecorder estats.MetricsRecorder, target string, watchExpiryTimeout time.Duration) (xdsclient.Config, error) {

  • While you are here, you could also refactor the code a little to pull out the common logic to from an internal server config to an external (or generic) server config. That code is currently repeated twice. If you could pull it out into a separate function, that would be nicer
• Update tests

@Pranjali-2501 : Please assign it back to me once you've handled the comment. Thanks.